Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 31 Jan 2007 18:15:48 +0000 (18:15 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 31 Jan 2007 18:15:48 +0000 (18:15 +0000)

Trivial merge